merge trunk
authorKenichi Handa <handa@etlken>
Thu, 22 Apr 2010 04:07:11 +0000 (13:07 +0900)
committerKenichi Handa <handa@etlken>
Thu, 22 Apr 2010 04:07:11 +0000 (13:07 +0900)
commitc890bac6c04efe21c3f2b3b6b8decdec8e6c1377
tree108c9d630a7f307115fbc033c0e87bae814b6be7
parent06d0aed3e4ee7d8184f3226de894f1b3d5e810cc
parente99997083ad117a4ff6a38c70c18229fea064255
merge trunk